From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 07:16:32 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=851186e371a32446e3425360113009dbe3198537;p=emacs.git

merge from trunk
---

851186e371a32446e3425360113009dbe3198537